remote conflict resolution